]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Fix problem when background settings change multiple times in rapid succession
authorOwen W. Taylor <otaylor@fishsoup.net>
Thu, 4 Sep 2014 14:01:52 +0000 (10:01 -0400)
committerOwen W. Taylor <otaylor@fishsoup.net>
Thu, 4 Sep 2014 14:07:24 +0000 (10:07 -0400)
The code that cleaned up when a background actor was destroyed tried to access
the Background as backgroundActor.background._delegate but when the destroy
signal is emitted, the MetaBackgroundActor was already disposed and
backgroundActor.background NULL.

js/ui/background.js

index ea5cae473bc1ebfae581ab50ae06c991cc4a573e..00b9d637589ee8495aa19d897088e718efba1c54 100644 (file)
@@ -701,7 +701,7 @@ const BackgroundManager = new Lang.Class({
                 background.disconnect(changeSignalId);
 
             if (backgroundActor.loadedSignalId)
-                backgroundActor.background._delegate.disconnect(backgroundActor.loadedSignalId);
+                background.disconnect(backgroundActor.loadedSignalId);
         }));
 
         return backgroundActor;